From: kaf24@firebug.cl.cam.ac.uk Date: Fri, 30 Sep 2005 14:45:20 +0000 (+0100) Subject: Fix earlier merge with Ewan's xenstore changes. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16763^2~64^2 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=8718286bfa77cac28604c546dc0ab7164e6e2ce9;p=xen.git Fix earlier merge with Ewan's xenstore changes. --- diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c index 9164e88806..9c5116692b 100644 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c @@ -607,7 +607,6 @@ void xenbus_suspend(void) down(&xenbus_lock); bus_for_each_dev(&xenbus_frontend.bus, NULL, NULL, suspend_dev); bus_for_each_dev(&xenbus_backend.bus, NULL, NULL, suspend_dev); - xb_suspend_comms(); } void xenbus_resume(void) @@ -651,7 +650,6 @@ int do_xenbus_probe(void *unused) int err = 0; /* Initialize xenstore comms unless already done. */ - printk("store_evtchn = %i\n", xen_start_info->store_evtchn); err = xs_init(); if (err) { printk("XENBUS: Error initializing xenstore comms:"